//Cambio 1 BranPrueba
//Cambio BranPrueba Ksa
public class Hola1 {

	public int getNothing(){
		return 0;
	}
}

/*
import org.tmatesoft.svn.core.internal.wc.DefaultSVNOptions;
import org.tmatesoft.svn.core.wc.*;

import java.io.File;
import java.util.Calendar;
import java.util.Collections;
import java.util.GregorianCalendar;

public class Merging {

	public static void main(String arg[]) {
		try {
			DAVRepositoryFactory.setup();
			Calendar calendario = new GregorianCalendar();
			System.out.println(calendario.get(Calendar.MINUTE)
								+ ":" + calendario.get(Calendar.SECOND));
			
			SVNURL url = SVNURL
					.parseURIEncoded("https://example-test-project.googlecode.com/svn/branches/HolaMundo/src/Hola2.java");

			File dstPath = new File("C:/CheckoutTrunk/src/Hola2.java");
			dstPath.mkdirs();

			DefaultSVNOptions options = SVNWCUtil.createDefaultOptions(true);
			String name = "Hapinerosa@gmail.com";
			String password = "YX7zv8aU9Qd9";
			SVNRevisionRange rangeToMerge = new SVNRevisionRange(
					SVNRevision.create(1), SVNRevision.HEAD);

			SVNClientManager ourClientManager = SVNClientManager.newInstance(
					options, name, password);
			SVNDiffClient diffClient = ourClientManager.getDiffClient();

			diffClient.doMerge(url, SVNRevision.HEAD,
					Collections.singleton(rangeToMerge), dstPath,
					SVNDepth.UNKNOWN, true, false, false, false);

			StatusHandler statusHandler = new StatusHandler();

			ourClientManager.getStatusClient().doStatus(dstPath,
					SVNRevision.HEAD, SVNDepth.INFINITY, false, false, false,
					false, statusHandler, null);

			System.out.println(statusHandler.getStatus());
		} catch (SVNException e) {
			System.out.println(e);
		}
	}

}
*/